From 93a029ac74a0f497b020e03d066594ab0108bb9c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 22 Jan 2008 14:34:37 +0000 Subject: [PATCH] ioemu: Use XEN_TARGET_ARCH instead of uname -m. Signed-off-by: Bastian Blank --- tools/Makefile | 2 +- tools/ioemu/configure | 36 ++++-------------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 14abf6026d..fddf7e5801 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -78,7 +78,7 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \ endif ioemu ioemuinstall: [ -f $(IOEMU_DIR)/config-host.mak ] || \ - ( cd $(IOEMU_DIR) && sh configure --prefix=/usr \ + ( cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \ $(IOEMU_CONFIGURE_CROSS) ) $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@) ioemuclean: diff --git a/tools/ioemu/configure b/tools/ioemu/configure index 767089c127..70cc1e997d 100755 --- a/tools/ioemu/configure +++ b/tools/ioemu/configure @@ -29,43 +29,15 @@ ar="ar" make="make" install="install" strip="strip" -cpu=`uname -m` target_list="" -case "$cpu" in - i386|i486|i586|i686|i86pc|BePC) +case "$XEN_TARGET_ARCH" in + x86_32) cpu="i386" ;; - armv*b) - cpu="armv4b" - ;; - armv*l) - cpu="armv4l" - ;; - alpha) - cpu="alpha" - ;; - "Power Macintosh"|ppc|ppc64) + powerpc) cpu="powerpc" ;; - mips) - cpu="mips" - ;; - s390) - cpu="s390" - ;; - sparc|sun4[muv]) - cpu="sparc" - ;; - sparc64) - cpu="sparc64" - ;; - ia64) - cpu="ia64" - ;; - m68k) - cpu="m68k" - ;; - x86_64|amd64) + x86_64) cpu="x86_64" libdir="lib64" ;; -- 2.30.2